Bugzilla #36460 (first part): Some minor cleanup and two bigger revamps of two cases Submitted by: Manuel Mall <mm.at.arcus.com.au>