Fixed problems with @Context/{get,set}.m [WIP]