Correct wrongly resolved merge conflict for "as" (was: #191)

Fix was merged in d117a47 but the test case for issue-178 still failed,
this commit makes all different uses for "as" behave properly.