Remove pointless preconditions from internal functions
Remove pointless __attribute__((noinline)) from _remap_image()
Also add some newlines